Merge from emacs-24; up to r108163
authorChong Yidong <cyd@gnu.org>
Fri, 2 Nov 2012 00:36:02 +0000 (08:36 +0800)
committerChong Yidong <cyd@gnu.org>
Fri, 2 Nov 2012 00:36:02 +0000 (08:36 +0800)
commita3ccce9dafb5d9f9cafcfe835737c23fbce88f0e
tree3754765391985efbe3fdffd32cc8f443e11078f3
parent446322045ad9be99c95f40d3e4c0fa43c5fd19a2
parent4b59fa745abe66f17231fa95d51b48a06025d7f2
Merge from emacs-24; up to r108163